mmc: matsushita-common: Special case only select registers in 16bit

There are only a few registerse used in the 16bit mode which are
32bit internally. Special-case only those in the IO accessors and
always write both halves. Any other register access is protected
from accidentally overwriting neighboring register.

Signed-off-by: Marek Vasut <[email protected]>
Cc: Jaehoon Chung <[email protected]>
Cc: Masahiro Yamada <[email protected]>

diff --git a/drivers/mmc/matsushita-common.c b/drivers/mmc/matsushita-common.c
index 3f538c354e6108bf3324235514552f00dcd19445..739586557ac319eeae9c458c273a1ac0b96772e3 100644 (file)
--- a/drivers/mmc/matsushita-common.c
+++ b/drivers/mmc/matsushita-common.c
@@ -68,7 +68,9 @@ void matsu_sd_writel(struct matsu_sd_priv *priv,
                writel(val, priv->regbase + (reg << 1));
        if (priv->caps & MATSU_SD_CAP_16BIT) {
                writew(val & 0xffff, priv->regbase + (reg >> 1));
-               if (val >> 16)
+               if (reg == MATSU_SD_INFO1 || reg == MATSU_SD_INFO1_MASK ||
+                   reg == MATSU_SD_INFO2 || reg == MATSU_SD_INFO2_MASK ||
+                   reg == MATSU_SD_ARG)
                        writew(val >> 16, priv->regbase + (reg >> 1) + 2);
        } else
                writel(val, priv->regbase + reg);